Manual merge.
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 26 Jul 2005 16:17:04 +0000 (16:17 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Tue, 26 Jul 2005 16:17:04 +0000 (16:17 +0000)

Trivial merge